Skip to content

recommitting files due to branch conflict. All PR changes reflected #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Oct 2, 2024

Conversation

marleomac3
Copy link
Contributor

No description provided.

marleomac3 and others added 13 commits October 1, 2024 15:26
* feat: Dasia quizz questions

* fix: duplicate declaration

* Fix: capitalization

* Forgot to delete a line

* duplicate name
* answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
* feat: added some quiz questions

* Update quizzes.module.ts

* Update quizzes.module.ts
* Create chelseaogbonnia's readme

* Update and rename lesson_00/chelseaogbonnia to lesson_00/chelsea_ogbonnia/ReadME.md

* Rename ReadME.md to README.md

* Create style.css

The CSS file to make my HTML look like a Github markdown.

* Created index.html

This is the markdown-to-html file with semantic html practice.

* Commit Message: Testing

* chore: remove invalid files

Signed-off-by: Anthony D. Mays <[email protected]>

* Delete lesson_02/lib/typescript/codedifferently-instructional/package-lock.json

---------

Signed-off-by: Anthony D. Mays <[email protected]>
Co-authored-by: Anthony D. Mays <[email protected]>
Co-authored-by: Anthony D. Mays <[email protected]>
* feat: Dasia quizz questions

* fix: duplicate declaration

* Fix: capitalization

* Forgot to delete a line

* duplicate name
* answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
* feat: Dasia quizz questions

* fix: duplicate declaration

* Fix: capitalization

* Forgot to delete a line

* duplicate name
* answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
* feat: added some quiz questions

* Update quizzes.module.ts

* Update quizzes.module.ts
Copy link
Contributor

@anthonydmays anthonydmays left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you're suffering from a bad merge. We can work together to figure this out tomorrow if you haven't figured it out yourself by then.

@marleomac3
Copy link
Contributor Author

I think I fixed the issue in w/ my most recent commit. There were some duplicate hash entries in the yaml that was causing the test to fail.

angie-3 and others added 9 commits October 2, 2024 14:34
* answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
* feat: added some quiz questions

* Update quizzes.module.ts

* Update quizzes.module.ts
* answers to test

* fix: rename class and file

* chore: eelete lesson_03/quiz/src/quizzes/angelica_castillo_quiz.ts

* changes made and saved

---------

Co-authored-by: Anthony D. Mays <[email protected]>
* feat: added some quiz questions

* Update quizzes.module.ts

* Update quizzes.module.ts
@anthonydmays anthonydmays merged commit 6cfc5d6 into code-differently:main Oct 2, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants